/[Apache-SVN]/httpd/httpd/trunk/modules/mappers/mod_alias.c
ViewVC logotype

Diff of /httpd/httpd/trunk/modules/mappers/mod_alias.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 151408, Fri Feb 4 20:28:49 2005 UTC revision 153384, Fri Feb 11 12:00:41 2005 UTC
# Line 40  typedef struct { Line 40  typedef struct {
40      const char *real;      const char *real;
41      const char *fake;      const char *fake;
42      char *handler;      char *handler;
43      regex_t *regexp;      ap_regex_t *regexp;
44      int redir_status;                /* 301, 302, 303, 410, etc */      int redir_status;                /* 301, 302, 303, 410, etc */
45  } alias_entry;  } alias_entry;
46    
# Line 112  static const char *add_alias_internal(cm Line 112  static const char *add_alias_internal(cm
112      /* XX r can NOT be relative to DocumentRoot here... compat bug. */      /* XX r can NOT be relative to DocumentRoot here... compat bug. */
113    
114      if (use_regex) {      if (use_regex) {
115          new->regexp = ap_pregcomp(cmd->pool, f, REG_EXTENDED);          new->regexp = ap_pregcomp(cmd->pool, f, AP_REG_EXTENDED);
116          if (new->regexp == NULL)          if (new->regexp == NULL)
117              return "Regular expression could not be compiled.";              return "Regular expression could not be compiled.";
118          new->real = r;          new->real = r;
# Line 176  static const char *add_redirect_internal Line 176  static const char *add_redirect_internal
176      alias_server_conf *serverconf = ap_get_module_config(s->module_config,      alias_server_conf *serverconf = ap_get_module_config(s->module_config,
177                                                           &alias_module);                                                           &alias_module);
178      int status = (int) (long) cmd->info;      int status = (int) (long) cmd->info;
179      regex_t *r = NULL;      ap_regex_t *r = NULL;
180      const char *f = arg2;      const char *f = arg2;
181      const char *url = arg3;      const char *url = arg3;
182    
# Line 196  static const char *add_redirect_internal Line 196  static const char *add_redirect_internal
196      }      }
197    
198      if (use_regex) {      if (use_regex) {
199          r = ap_pregcomp(cmd->pool, f, REG_EXTENDED);          r = ap_pregcomp(cmd->pool, f, AP_REG_EXTENDED);
200          if (r == NULL)          if (r == NULL)
201              return "Regular expression could not be compiled.";              return "Regular expression could not be compiled.";
202      }      }
# Line 314  static char *try_alias_list(request_rec Line 314  static char *try_alias_list(request_rec
314                              int doesc, int *status)                              int doesc, int *status)
315  {  {
316      alias_entry *entries = (alias_entry *) aliases->elts;      alias_entry *entries = (alias_entry *) aliases->elts;
317      regmatch_t regm[AP_MAX_REG_MATCH];      ap_regmatch_t regm[AP_MAX_REG_MATCH];
318      char *found = NULL;      char *found = NULL;
319      int i;      int i;
320    
Legend:
Removed from v.151408  
changed lines
  Added in v.153384
apache@apache.org
 ViewVC Help
Powered by ViewVC 1.1.2